Skip to content

Conversation

@loujar
Copy link
Contributor

@loujar loujar commented May 15, 2025

Add INDEXED_SEARCH_INDEXER to sourcegraph-frontend-internal service ENVs. Follow up to #1208

Checklist

  • Sister deploy-sourcegraph change:
  • Sister customer-replica change (if necessary, for any changes affecting pure-docker or configuration):
  • All images have a valid tag and SHA256 sum

Test plan

CI

@loujar loujar requested a review from marcleblanc2 May 15, 2025 23:22
@marcleblanc2 marcleblanc2 enabled auto-merge (squash) May 15, 2025 23:23
@marcleblanc2 marcleblanc2 disabled auto-merge May 15, 2025 23:45
@marcleblanc2 marcleblanc2 enabled auto-merge (squash) May 15, 2025 23:46
@marcleblanc2
Copy link
Contributor

Bump to retry buildkite

@marcleblanc2 marcleblanc2 merged commit 782c470 into main May 16, 2025
10 checks passed
@marcleblanc2 marcleblanc2 deleted the lsj/sourcegraph-frontend-internal-INDEXED_SEARCH_INDEXER branch May 16, 2025 16:21
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 6.2.x failed at https://github.com/sourcegraph/deploy-sourcegraph-docker/actions/runs/15072927888:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 6.2.x -p 1209
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-6.2.x 6.2.x
# Navigate to the new working tree
cd .worktrees/backport-6.2.x
# Create a new branch
git switch --create backport-1209-to-6.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 782c470fcecea6184033930ec29bd3ebe28066c0
# Push it to GitHub
git push --set-upstream origin backport-1209-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1209-to-6.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.2.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.2.x and the compare/head branch is backport-1209-to-6.2.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot
Copy link
Collaborator

The backport to 6.3.x failed at https://github.com/sourcegraph/deploy-sourcegraph-docker/actions/runs/15072927888:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 6.3.x -p 1209
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-6.3.x 6.3.x
# Navigate to the new working tree
cd .worktrees/backport-6.3.x
# Create a new branch
git switch --create backport-1209-to-6.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 782c470fcecea6184033930ec29bd3ebe28066c0
# Push it to GitHub
git push --set-upstream origin backport-1209-to-6.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.3.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1209-to-6.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-6.3.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 6.3.x and the compare/head branch is backport-1209-to-6.3.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants